Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pass correct HirId to late_bound_vars in diagnostic code #130879

Merged
merged 1 commit into from
Sep 27, 2024
Merged

Pass correct HirId to late_bound_vars in diagnostic code #130879

merged 1 commit into from
Sep 27, 2024
+55 −10

Conversation

fmease
Copy link
Member

@fmease fmease commented Sep 26, 2024 •
edited
Loading

Fixes #130858.
Fixes #125655.
Fixes #130391.
Fixes #130663.

r? compiler-errors

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Sep 26, 2024
@compiler-errors
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 26, 2024

📌 Commit 37c716b has been approved by compiler-errors

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 26, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@compiler-errors
Copy link
Member

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 26, 2024
@fmease
Copy link
Member Author

fmease commented Sep 26, 2024

@bors r=compiler-errors

@bors
Copy link
Contributor

bors commented Sep 26, 2024

📌 Commit 17d9924 has been approved by compiler-errors

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 26, 2024
@fmease
Copy link
Member Author

fmease commented Sep 26, 2024

Right, this also fixes #130391. I'll add another test.
@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 26, 2024
@fmease
Copy link
Member Author

fmease commented Sep 26, 2024

@bors r=compiler-errors

@bors
Copy link
Contributor

bors commented Sep 26, 2024

📌 Commit 7f41c7e has been approved by compiler-errors

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 26, 2024
@fmease
Copy link
Member Author

fmease commented Sep 26, 2024

Ah, and #130663 ^^. Same reason.
@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 26, 2024
@fmease
Copy link
Member Author

fmease commented Sep 26, 2024

@bors r=compiler-errors

@bors
Copy link
Contributor

bors commented Sep 26, 2024

📌 Commit e29ff8c has been approved by compiler-errors

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 26, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Sep 26, 2024
@matthiaskrgr
Rollup merge of rust-lang#130879 - fmease:fix-diag-ice, r=compiler-er…
3965472 
…rors

Pass correct HirId to late_bound_vars in diagnostic code

Fixes rust-lang#130858.
Fixes rust-lang#125655.
Fixes rust-lang#130391.
Fixes rust-lang#130663.

r? compiler-errors
@matthiaskrgr matthiaskrgr mentioned this pull request Sep 26, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 26, 2024
@bors
Auto merge of rust-lang#130893 - matthiaskrgr:rollup-u4rpfrm, r=matth…
ea37d7e 
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#129687 (Implement RFC3137 trim-paths sysroot changes - take 2)
 - rust-lang#130517 (Add the library workspace to the suggested rust-analyzer config)
 - rust-lang#130820 (Fix diagnostics for coroutines with () as input.)
 - rust-lang#130833 (Fix the misleading diagnostic for `let_underscore_drop` on type without `Drop` implementation)
 - rust-lang#130845 (Utf8Chunks: add link to Utf8Chunk)
 - rust-lang#130850 (Pass Module Analysis Manager to Standard Instrumentations)
 - rust-lang#130868 (Update FIXME comment in s390x_unknown_linux_*.rs)
 - rust-lang#130873 (rustc_target: Add powerpc64 atomic-related features)
 - rust-lang#130879 (Pass correct HirId to late_bound_vars in diagnostic code)
 - rust-lang#130880 (add missing FIXME(const-hack))

r? `@ghost`
`@rustbot` modify labels: rollup
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Sep 26, 2024
@workingjubilee
Rollup merge of rust-lang#130879 - fmease:fix-diag-ice, r=compiler-er…
6490a7d 
…rors

Pass correct HirId to late_bound_vars in diagnostic code

Fixes rust-lang#130858.
Fixes rust-lang#125655.
Fixes rust-lang#130391.
Fixes rust-lang#130663.

r? compiler-errors
@workingjubilee workingjubilee mentioned this pull request Sep 26, 2024
Closed
@GuillaumeGomez GuillaumeGomez mentioned this pull request Sep 26, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 26, 2024
@bors
Auto merge of rust-lang#130907 - GuillaumeGomez:rollup-423r4i4, r=Gui…
58420a0 
…llaumeGomez

Rollup of 11 pull requests

Successful merges:

 - rust-lang#130279 (Document subtleties of `ManuallyDrop`)
 - rust-lang#130517 (Add the library workspace to the suggested rust-analyzer config)
 - rust-lang#130820 (Fix diagnostics for coroutines with () as input.)
 - rust-lang#130833 (Fix the misleading diagnostic for `let_underscore_drop` on type without `Drop` implementation)
 - rust-lang#130845 (Utf8Chunks: add link to Utf8Chunk)
 - rust-lang#130850 (Pass Module Analysis Manager to Standard Instrumentations)
 - rust-lang#130861 (Use `mem::offset_of!` for `sockaddr_un.sun_path`)
 - rust-lang#130862 (rustdoc: do not animate :target when user prefers reduced motion)
 - rust-lang#130868 (Update FIXME comment in s390x_unknown_linux_*.rs)
 - rust-lang#130879 (Pass correct HirId to late_bound_vars in diagnostic code)
 - rust-lang#130880 (add missing FIXME(const-hack))

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ed902a8 into rust-lang:master Sep 27, 2024
6 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Sep 27, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Sep 27, 2024
@rust-timer
Unrolled build for rust-lang#130879
4457679 
Rollup merge of rust-lang#130879 - fmease:fix-diag-ice, r=compiler-errors

Pass correct HirId to late_bound_vars in diagnostic code

Fixes rust-lang#130858.
Fixes rust-lang#125655.
Fixes rust-lang#130391.
Fixes rust-lang#130663.

r? compiler-errors
@fmease fmease deleted the fix-diag-ice branch September 27, 2024 05:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@compiler-errors compiler-errors compiler-errors approved these changes

Assignees

@compiler-errors compiler-errors

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.83.0
5 participants
@fmease @compiler-errors @bors @rust-log-analyzer @rustbot